From: Alex Williamson <alex.williamson@hp.com>
Date: Thu, 6 Sep 2007 18:05:15 +0000 (-0600)
Subject: merge with xen-unstable.hg (staging)
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14997
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=813d34b4d07947172c06ef333da6567ea00fc312;p=xen.git

merge with xen-unstable.hg (staging)
---

813d34b4d07947172c06ef333da6567ea00fc312
diff --cc xen/arch/ia64/xen/domain.c
index c8cd84a74b,e9d1d3103b..eb5bc68448
--- a/xen/arch/ia64/xen/domain.c
+++ b/xen/arch/ia64/xen/domain.c
@@@ -936,10 -937,11 +937,11 @@@ static void relinquish_memory(struct do
      spin_unlock_recursive(&d->page_alloc_lock);
  }
  
- void domain_relinquish_resources(struct domain *d)
+ int domain_relinquish_resources(struct domain *d)
  {
+     int ret;
      /* Relinquish guest resources for VT-i domain. */
 -    if (d->vcpu[0] && VMX_DOMAIN(d->vcpu[0]))
 +    if (d->arch.is_vti)
  	    vmx_relinquish_guest_resources(d);
  
      /* Tear down shadow mode stuff. */